Merge change 3537

* changes:
  Add tag for AggregationService.