wip/cvsnt/patches
