Please approve the backport of the fix from jdk9 to jdk8u-dev repository. It applies cleanly and passes the tests. Issue: https://bugs.openjdk.java.net/browse/JDK-8040058 Changeset: http://hg.openjdk.java.net/jdk9/jdk9/jdk/rev/ea141745e90d Thanks, Roger