Merge branch 'jk/empty-archive' into maint