Use isset instead of array_key_exists.
Merge branch '4.1' into 4.2