Updated for upstream release v0.10.0