wip/fbida/patches
