Merge branch 'jc/repack'