Merge "Select proper flavor_ref_alt for Tempest"