Merge pull request #19554 from commodo/numpy