Merge "Handle missing flavor.id in server response"