Mr fix aggregation

Merged Krzysztof requested to merge Michonski/dss-mainline:MR_fix-aggregation into master Oct 25, 2019