Martin Yde - #8513, changed aggregation settings