Merge change 6664

* changes:
  New sync framework: add new columns.