Merge branch 'emoji-upload' into 'develop'