Merge "Fix a minor error in method _get_alternative_flavor"