wip/or1ksim/patches
