Merge branch 'hotfix/dashboard_refresh'
Fix
Merge branch 'hotfix/alignments' into develop