Dashboard configuration
Merge branch 'hotfix/dashboard_configuration'