wip/rygel/patches
