Merge "Dashboard rationalization"