Merge branch 'jc/repack-threads'