wip/mwf-designer/patches
