wip/R-Rserve/patches
