Adding rpcserver config option
Merge branch 'develop'