jdk

6de472e3 - partial code review update