Merge branch 'rprpc-2nd-rewrite-part-1'