Havanna updates for heat and murano from Max Mazur

Run system tests before merge!