Merge branch 'esr/maint-doc-fast-import'