test
Merge branch 'hotfix/encoding_issue' into develop

* hotfix/encoding_issue:
  test