Merge pull request #9307 from annando/notice