Merge branch 'jk/repack-leakfix'