Merge pull request #6621 from annando/notice