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