Merge pull request #9314 from annando/suggestions