Merge branch 'cn/commit-amend-doc' into maint