jdk

f11153b3 - merge latest from master branch