Merge branch 'jc/pack-thin' into next