Rebase to upstream v0.7.0