fixed errors in persistance and aggregator
Merge remote-tracking branch 'upstream/master'