Merge remote-tracking branch 'origin/farm/584fc779/fix-litellm-model-…