Merge branch '0.9-migration' into release-0.9.0