jdk

f35f70a2 - merge latest from master branch