refactor notifications
Merge branch 'fix'