jdk

9f7e56c9 - merge latest from master branch