Merge "Get rid of mcp_version for external images"