Merge "Port availability zones to core API"