Merge other changes into embs-pack-v5