Merge branch 'hotfix/hotfix'
Main groups
Company API
Permissions fix
Merge branch 'hotfix/hotfix' into develop