Merge pull request #9990 from annando/notice