jdk

7fbc4509 - Address some changes from code review