Merge "Merge branch 'master' into notification-service" into notification-service