Closes #13322 (grafted from 0faa38dd5e923e9a59eb41b2cd93e78021f81d8b) --HG-- branch : 6.0
--HG-- branch : 6.0