Examples of backporting the fix from Django ticket #34063 - View it on GitHub