SYNC-1243 Fix SF
SYNC-1243 Regen (for previous changes to SyncContext)