Merge branch 'sb/repack-in-c' into maint