Merge commit 'f942558bc57025c0724596832817295a52ceea91' * commit 'f942558bc57025c0724596832817295a52ceea91': Add fields to pass ungrouped counts to UI.
Merge commit 'f942558bc57025c0724596832817295a52ceea91' * commit 'f942558bc57025c0724596832817295a52ceea91': Add fields to pass ungrouped counts to UI.