WIP: django-3.2-compat #3

Draft
slamora wants to merge 8 commits from django-3.2-compat into main

8 commits