jdk

0e9b7cbe - address review comments