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