Merge pull request #3644 from eileenmcnaughton/e-notice-ps