Merge "Use known flavor ID as marker"