Merge "Drop not used heat/control.sls"