Merge branch 'feature/1854-emoji-pagination' into 'develop'