Merge branch 'add-custom-emoji-test' into 'develop'