MAJOR overhall to notifications system
Merge remote-tracking branch 'origin'