+con #3578 Aggregator contribution (forward port)

(cherry picked from commit ea3d9fd8a188bc5534f31ca0ba57751d01be3b66)