Merge pull request #23939 from commodo/python-updates1