Merge change 9626

* changes:
  Adding columns SYNC1-4 and fixing tests.