Closes #13569 (grafted from 3d677f970da3c675ba81ab8b6755ad5865512112) --HG-- branch : 6.0
--HG-- branch : 6.0