Merge branch 'tb/repack-fix-renames' (early part)