Closes #12716 (grafted from 5412054f7f7ed333a5e8f56fa18090e1727ae7c8) --HG-- branch : 6.0
--HG-- branch : 6.0