wip/nbfc/patches
