Code

Merge branch 'jn/fast-import-empty-tree-removal' into maint