jdk

3993eca5 - merge latest from master branch