Merge branch 'hotfix/hotfix'
Permissions fix
Merge branch 'hotfix/hotfix' into develop