Merge branch 'openapi/custom-emojis' into 'develop'