Merge "Heat dashboard rationalization"