Merge pull request #16821 from eileenmcnaughton/array3