Merge branch 'emoji-reaction-extensions' into 'develop'