sync-engine-shared - Reuse handler
sync-engine-shared - Use correct handler