ARTEMIS-8027 - working in dashboard3 branch

please merge dashboard3 changes into master.