Merge pull request #5756 from annando/more-notices