Merge "Fix overrides work correctly in virtual-mcp-pike-ovs"