Update rpc apis and fix delegate approve call name change
Merge from origin/master