Merge pull request #21184 from commodo/numpy