wip/rte/patches
