Cherry pick azure test failing
Cherry picking !18 (merged) into the release branch, to fix an integration test failure.
GitLab's cherry-pick MR didn't work, possibly because of some manual branch squashing that was done on the main MR. This is the result of me applying the cherry picks myself on the three commits that seemed to be part of the work.