Backport of 7162125

--HG--
branch : 8u40-verified-fixes
14 files changed