Merge branch 'master' into Adar
dashboard: use calculated data
Merge branch 'master' into Adar
dashboard: display calculated data
Merge branch 'Adar'