wip/xgobi/patches
