wip/cde/patches
