More efficient purges.
Merge fix for bulk purges from master
Merge remote-tracking branch 'upstream/aggregates' into aggregates