Merge pull request #21659 from eileenmcnaughton/notice2