Havanna updates for heat and murano from Max Mazur

Run tests before merging!