Merge branch 'bugfix/no-cc-mentions' into 'develop'