Merge "Fix temperature sensor"