Merge branch 'safe-mentions' into 'develop'