Closes #12192 (grafted from 0a0a644d5a20e6f838c30a7ef7f3d4c550422142) --HG-- branch : 6.0
--HG-- branch : 6.0