Merge pull request #17184 from commodo/python-reorg