A0-4569: Make initial unit collection more independent#549

timorleph merged 2 commits intomainCardinal-Cryptography/AlephBFT:mainfrom

A0-4569-skaroundCardinal-Cryptography/AlephBFT:A0-4569-skaroundCopy head branch name to clipboard