Merge with jdk8u112-b02