Merge "Add dataFailCause existence check"