Merge pull request #22118 from eileenmcnaughton/notices