Merge branch 'hotfix/group_error'
Fix
Merge branch 'hotfix/group_by_fix' into develop