Merge "Convert request schema (flavors)"