Apply notification changes working affinitic refs #5833