Merge branch 'jc/pack-heuristics'