wip/e17/patches
