Merge pull request #16719 from colemanw/arrayValue3