Update aggregate handling

(cherry picked from commit cf961ac8933b76d9f0a3ac3eb49cc08879f5bcc9)

Created by  Eelco Dolstra  on February 17, 2020
7OINEDQ5GPU2DOSVIBSULR2LBF3T6NUP7B5TYNKZR7AZW5B4ASRAC
Change contents