DSD-6107 - Fix unstable aggregations

Merged Krzysztof requested to merge Michonski/dss-mainline:DSD-6107_fix-unstable-aggregation into master Jan 14, 2020