* use rpc whitelist with cb
Merge branch 'dev' into distributed_deployment