Merge branch 'supported-emojos' into 'develop'