Merge change I56e23586 into eclair

* changes:
  Reduce the sync window from 20 items to 5 (partial fix #2149029)