jdk

eeeb7181 - Clean up adapting review comments