Merge branch 'emoji-cache' into 'develop'