Merge pull request #19229 from commodo/python-updates1