Merge change 2978

* changes:
  Adds "is_primary" and "is_super_primary" columns to DataColumns.