Merge remote-tracking branch 'origin/master' into users/amaverma/updatedMRTemplate

2 jobs for !19 with users/amaverma/updatedMRTemplate in 6 minutes and 10 seconds (queued for 2 seconds)
merge request