Merge branch 'support-emoji-staticfe' into 'develop'