Merge branch 'fix/emoji-api-nonsense' into 'develop'