fix an issue related to grand total when I use count aggregator
Merge remote-tracking branch 'origin/master'