Merge pull request #9106 from annando/notice