Merge "Revise the notification service"