Merge with jdk8u76-b03