Merge "Add dataFailCause existence check" into tm-dev