Merge "Modify scaleOut-related settings" into dublin