NXP-14879: Make range aggregation work