Update aggregate handling

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