wip/xgfe/patches
