I'd like to backport this fix to jdk8u-dev. Applies cleanly. https://bugs.openjdk.java.net/browse/JDK-8071125 jdk changeset : http://hg.openjdk.java.net/jdk9/dev/jdk/rev/a7147a466b12 review thread : http://mail.openjdk.java.net/pipermail/net-dev/2016-April/009715.html -- Regards, Sean.