jdk

cfba18ff - improve some parts based on review comments