jdk

0fb1a632 - Updates as per review comments