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