Merge change 21367 into eclair

* changes:
  Simplified and fixed aggregation on structured name.