jdk

95396668 - Update after Roberto's comments and suggestions