Merge branch 'dashboard-fix'