Merge branch 'jk/maint-fast-import-doc-dedup-done' into maint