Merge pull request #20442 from commodo/python-updates1