Merge "Fix checkListKey not checking actual/expected values"