Merge branch 'jk/repack-reuse-object' into maint