jdk

ec0834a3 - Addressing review comments