Merge branch 'develop' into release-6.0rc2
Merge branch 'develop' into release-6.0rc2
Remove unnecesary escape. bugid:110609
Remove unnecesary escape. bugid:110609
Merge branch 'release-6.0rc2' into develop