Merge "Add scale out TCs with availability zone support"