Merge pull request #8301 from annando/suggestme