Merge "Fix name of TemperatureControlTemplate"