Merge pull request #21987 from eileenmcnaughton/enotice