wip/tendra/patches
