CSPACE-6266: More replacement of notices with notify resources.