jdk

d451ea0b - merge latest from master branch