Merge branch 'disruptive-notification' into next