Merge branch 'hotfix/widget-hotfix'
Permissions fix
Merge branch 'hotfix/permissions_fix' into develop