Merge "Replace ZONE_ALL with ZONE_ROW_1_ALL for HVAC" into nyc-dev