Simplify the notification manager
Merge remote-tracking branch 'origin/master'