Notification related changes
Merge branch 'general_changes'