Expandeded fix for 3043282 to cover arrays as well
2 files changed