Merge "Reverting checks after toArray() calls"