wip/qore/patches
