Merge "bugfix: missing mcp ssh_key mapping"