wip/tipp10/patches
