Merge branch 'notifications' into next