wip/qhacc/patches
