Merge branch 'jk/repack-ref-racefix'