Merge pull request #22719 from eileenmcnaughton/notice_page