wip/sollya/patches
