Merge pull request #17470 from colemanw/array