Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'