Merge pull request #53 from onefinestay/master-merge

Master merge
Merge remote-tracking branch 'origin/evolutionary' into nova-rpc-depency-provider