Looking to backport this change from JDK 8u. JDK 8u changeset applies cleanly. bug report : https://bugs.openjdk.java.net/browse/JDK-8052406 changeset : http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/ddba61b06470 regards, Sean.