Merge branch 'tb/multi-pack-reuse-experiment'