Merge branch 'bugfix/959-emoji-loading' into 'develop'