Add RPC
Merge branch 'A'