Merge "Set allow_availability_zone_fallback option"