Merge pull request #22072 from commodo/python-updates1