A rebase should fix the doc build, if this is something we still want to backport.

I've rebased on to the latest v3.10.x

Rerunning failed Azure Linux checks. They were all timeout errors, not image test errors, so probably unrelated to the changes here, but there were 9 failures, which is more than we usually see for stochastic failures. And it was on Linux where the vast majority of such timeout problems are on Windows for us.

I'll be satisfied if they pass, will re-evaluate if they fail.

Hmmm... seems like we are continuing to get failures on the Azure Linux 3.11 build...

However, does not appear to be unique to this PR upon closer look at recent backports, so willing to merge over.