issue10740 review334971002 (grafted from d0501664206fdbabc93d2d32c17f87c890ab6b09) --HG-- branch : 6.0