jdk

b5ccc05d - Review comments from @erikj79