Merge pull request #9323 from annando/notice