Merge change 6223

* changes:
  Changes for new sync.