Merge branch 'fix/emoji-encoding' into 'develop'