Merge pull request #8638 from eileenmcnaughton/notices