Permissions fix
Merge branch 'hotfix/permissions_fix'