fixed some string
Merge branch 'release-1.2' into develop
fixed some string