wip/dmapd/patches
