CSPACE-6266: Restore notice->notify changes from previous commits.