Merge "Fix model_type missing"