Merge "Add HVAC properties" into pi-dev