Merged in EtsySyncService and all dependencies