Merge pull request #21050 from eileenmcnaughton/notice