Merge change 20935

* changes:
  Fixing the bug where the aggregator would get repeatedly interrupted.