Merge "Revert "delete toolbox/r.c""