SI-5353 Fix Array unsoundness [Rebase of #2703]

[Rebase of #2703]