Merge "Aggregate power data in AggregateBatteryConsumers" into sc-dev