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