Delta merge from m10 to m12

2 jobs for !276 with azure-m14-candidate in 32 seconds (queued for 2 seconds)
merge request