Merge branch 'feat-selected-group-by'

This reverts commit 10f74645314f62cce18b929ebe6ddc1a48949d83.