jdk

f1c57d0b - merge latest from master branch