Merge "Notification endpoint stuffs."