Merge branch 'jc/pack-order-tweak'