Bug fixed
Merge branch 'rel-v6r11' into rel-v6r12