Merge branch 'single_emoji_reaction' into 'develop'