Merge change 23009 into eclair

* changes:
  fix a bug that can allow multiple syncs to start in parallel