RPC proxies shouldn't override clone and finalize either
Merge branch '2.4'