Retry sinchronizations up to 3 times
Merge remote-tracking branch 'origin/feature/CDB-681' into release/2.3.1