Merge "Patch to fix test_rebuild_volume_backed_server" into mcp/caracal