Merge "Dashboard rationalization for Calico"