Merge "rpcContext small changes"