Merge "Add flavor_alt_ref"