Merge branch 'emoji-in-summary' into 'develop'