Merge "Fix Hypervisor dashboard"