Merge "Rewrite Notification subsystem"