Merge "u/fuel: Bump & rebase for cmp MCP repos"