Merge pull request #20298 from mpashchenkov:mp/python-desync