Closes #7779 (grafted from 898ada1d40173616e801cf579ce449bdb27501ce) --HG-- branch : 6.0
--HG-- branch : 6.0