Merge branch 'runtime-emojis' into 'develop'