backported the fix for JDK-8130430
2 files changed