issue10924 review375901002 (grafted from 54994e1bdde91e324ab05d3b24715510c1549a89) --HG-- branch : 6.0