wip/svrcore/patches
