jdk

f4cf078e - merge latest from master branch