Merge branch 'fix/emoji-task-docs' into 'develop'