Backport of 8043340

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