Merge pull request #21782 from eileenmcnaughton/notice