Merge "Move some dashboard-specific code into own package" into sc-dev