Merge branch 'emoji-loader-fix' into 'develop'