wip/xpde/patches
