Merge remote-tracking branch 'my_fork/feature-mcp-integration' into feature/mcps-integration