Merge change 22656 into eclair

* changes:
  Adding an aggregation mode: AGGREGATION_SUSPENDED