Could someone else review this PR to cherry_picker?

I don’t think I have the capacity to do more thorough review to this PR.

If someone else would be able to help review it, it would be appreciated.

The only thing I really care about is that there is no changes to how it works for CPython /miss-islington’s purpose.