Merge pull request #21632 from eileenmcnaughton/notice2