Merge branch 'mh/simplify-repack-without-refs'