Add basic support for new dashboards for 6.0
Apply additional option for correct dashboard loading
Merge branch 'feature/new_dasboard' into develop