content resolver
Merge branch 'groupby'