wip/hs-hashed-storage/patches
