Merge branch 'fix-emoji-pagination' into 'develop'