Merge "Notification Handler service"