Merge "Fix flavor info in server response schema"