Looks good, not sure if we want this for the freeze though.
The planned release date is about two weeks away at this point, so I'm leaning towards "no", although I could still be convinced otherwise. That's not necessarily true for all of the test changes that seem to make up the bulk of this MR; at least some of those also have their own MRs though, which seem stalled one way or another.