ENG-5614: Snapshot syncing improvements