wip/osmose/patches
