sync-engine-shared - Apply SYNC-1243