Task rewrite: adopt AggregatorTask
in datastore
#2017
Merged
AggregatorTask
in datastore
#2017