Merge branch 'notification-service'