Add group_by_. Deprecate regroup. #352