jdk

1f7d66d3 - fixed more from merge