patch applied (cabal): significant progress on UHC support