Cherry picking changes from m10-master

2 jobs for !578 with azure/m12-backfill in 34 seconds (queued for 1 second)
latest merge request