Merge pull request #13970 from eileenmcnaughton/array_format_3