Merge "Initial drop of rProxy code"