issue10862 review373901002 (grafted from 2d70702c1424d83cdaf430d780098764b046b714) --HG-- branch : 6.0
issue7942 review54461002