Merge "Sync too many retries"