[Change] continuing work on metadata aggregation