Merge branch 'bugfix/incoming-poll-emoji' into 'develop'