Merge branch 'ds/multi-pack-verify'