Merge "Fix for volume multiattach check" into mcp/caracal