Merge branch 'features/emoji_stealer' into 'develop'