HCOLL-77 refactors around the bootstrapping, added in a second layer of handshaking