Upstream: Add more expansive UUID based operations