Kevin, Leif, Could you please review the patch attached here: https://bugs.openjdk.java.net/browse/JDK-8143033 Whilst the patch itself is tiny, a sanity check that what I'm doing would be much appreciated. Refer to my comment in Jira for more context. Thanks, -- Jonathan