Merge change 4768

* changes:
  Implement sliding window sync.