Merge pull request #9304 from annando/suggestions