OC-1194: Adapt Sync Process using etag