wip/hs-hxt/patches
