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