Merge branch 'hotfix/2.2.3.1' into develop
fix more utf8 problems
Merge branch 'release/2.2.3.2'