Update to Sync v4, and Test Data
Merge remote-tracking branch 'origin'