wip/d4x/patches
