Merge branch 'jt/repack-promisor-packs'