hotfix for dashboard
hotfix for dashboard
merge master hotfixes