Merge branch 'hotfix/groups'
Debug function
Merge branch 'hotfix/debug' into develop