Merge "Fix for cvp-ha for mcp with OC4"