Merge branch 'v0.9.11-hotfix' into v0.9.11

6 jobs for v0.9.11-unreleased
latest