Merge "List column names in the error message" into oc-mr1-dev