A bunch of 3.12 compat stuff

Merge request reports

Loading