Merged changes from default

--HG--
branch : 8u40-verified-fixes