wip/aravis/patches
