Closes #13662 (grafted from 23916deaf57fd2fcf7a35deec337fb9a8e479bec) --HG-- branch : 6.0
--HG-- branch : 6.0