Merge branch 'jk/perf-aggregate-wo-libjson'