Merge branch 'cn/diff-indent-no-longer-is-experimental' into maint