Fixed a merge error that broke notification summaries and blocking messages.:
Merge branch 'CustomNotifications' into CustomSystems