wip/opentyrian/patches
