Merge branch 'jn/maint-fast-import-object-reuse' into next