Merge pull request #23837 from krant/numpy