Merge pull request #22036 from eileenmcnaughton/notice