Merge "Add suport for availability zones"