### Describe the solution you'd like See #398 (PR #422) where we did this for 3.7/3.12. Can see the several things that were done there and similar should be done here.