jdk

34b35911 - merge latest from master branch