Merge branch 'hotfix/dashbaord_fix'
Widget fix
Merge branch 'hotfix/permissions_fix' into develop