Merge branch 'hotfix/notifications_hotfix'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Dashboard configuration
Merge branch 'hotfix/dashboard_configuration' into develop