Merge change 497

* changes:
  change the sync framework and users to understand Account