Closes #12946 (grafted from dd9635826c8a493f4268690a47d37ee039b2d65a) --HG-- branch : 6.0
--HG-- branch : 6.0