FYI JDK-8204240 has some platform specific change