jdk

ff98d876 - Review feedback from @japai