Added additional array key checks.
Issue: aar/OASIS#576 aar/OASIS#577
Merge branch '7.x-4.2.6-oasis-577' into 7.x-4.2.6-1.x