wip/libcli/patches
