wip/xtrace/patches
