task #00012-Add_dashboards: Features update
Merge branch '00012-Add_dashboards' into develop