issue10621 review342831002 (grafted from b7ba7525fd00e7560e52868a51421a5a22afa7c0) --HG-- branch : 6.0