Merge pull request #21633 from eileenmcnaughton/notices_s