Merge branch 'improve-notification-handling' into next