Upgrade to master branch v0.6.0-dev code.