Merge pull request #8097 from eileenmcnaughton/enotice