Merge branch 'fix/split-custom-emoji' into 'develop'