@charris would it be possible to only backport the first commit (8a2ae20)? The changes in ma/core.pyi build upon #28677, which isn't backported _{but doing so probably won't cause any issues although @seberg probably wouldn't like that, so we should be careful not to tag him here...}

cc @MarcoGorelli

Not sure why we shouldn't backport #28677.

Thanks Joren.

I decided not to backport #28677, there are a lot of changes in main that have not been backported, and 2.3 isn't that far off.

See #28758. It is failing the typing tests.