Merge branch 'v0.10.9-release' into v0.10