Merge "Fix skipping test volume swap" into mcp/epoxy