Merge branch 'emoji-alphabetical-ordering' into 'develop'