Closes #12705 (grafted from c2affdaec4f9f8c5b75f5f7e9f938f1e6680fdee) --HG-- branch : 6.0
--HG-- branch : 6.0