encoding issue
Merge branch 'hotfix/encoding-issue'