JBS: https://bugs.openjdk.java.net/browse/JDK-8276536 Webrev: http://cr.openjdk.java.net/~dcherepanov/openjdk7u/8276536/webrev.01/ Backported on top of JDK-8275766. The patch doesn't apply cleanly due to context differences (JDK-8000983 isn't in 7u). Relevant tests passed. Thanks, Dmitry