Merge branch 'bc/repack' into next