Merge "Add tempest_heat in gates"