Merge branch 'jk/fast-import-fixes' into maint