Merge branch 'release-0.9' into feature-osv2-compatibility