Merge "Fill schema gap in flavors.py"