Description
I had intended to do this after letting it bake on main, but forgot to do so. #14226 was the main change, but I think there were a couple of followup patches and/or test fixes that also need to be backported. We also need to check if there are any changes to public APIs. I don't think there were, but it's been a couple of months now ...