Merge pull request #21441 from demeritcowboy/dashboard-fail2