Closes #12098 (grafted from a6b41e6401ec070f5cdf97115bfd2c22c3dccdac) --HG-- branch : 6.0
--HG-- branch : 6.0