Merge branch 'bc/repack'