Merge pull request #6651 from annando/config-mentions-removal