avoid naming clashes
Merge branch 'rpcproxy'
version bump