Merge branch 'hotfix/dashboard_configuration'
Dashboard fix
Merge branch 'hotfix/notification_widget_fix' into develop