Merge pull request #13008 from commodo/python-batch1