Merge "Handle public volumes and otherwise invalid UUIDs." into pi-dev