[DO NOT MERGE] API and Django upgrade