wip/commoncpp2/patches
