Merge "Merge branch 'notification-service'"