wip/davical-current/patches
