Fix invalid text. bugid:110477
Merge branch 'release-6.0rc1' into develop