I think that should be pretty straightforward, basically the same change as for the stable branch.

That’s a non-trivial change right before the beta, though. Can you bring it up on the release-mgmt mailing list?