Merge "Adjust flavor parameter in TC002"