Merge "Fix Flavors table syntax"