Merge "Dashboard rationalization for Kubernetes"