Martin Yde - #8513, Changed aggregation settings