index on master: 6a5b29d dynamic agg v.1
WIP on master: 6a5b29d dynamic agg v.1
Merge commit 'stash'