Merge change 3049

* changes:
  Adding a new type: aggregation_exception.