Merge branch 'jc/legacy-loose-object' into maint