Fixed text error
Merge branch 'hotfix-1.11.17'