Merge branch 'mb/fast-import-delete-root' into maint