issue11476 review417311003 (grafted from e9d19f24dd30cef8e6e887a40ef699aea4efffd7) --HG-- branch : 6.0