Merge remote-tracking branch 'origin/release' into release

storage/utility/blockStore.go

@@ -21,6 +21,7 @@ const (
 const (
 	bsBuffLengthErr   = "length of buffer %d != %d expected"
 	bsKvSaveErr       = "failed to save blockStore to KV: %+v"
+	bsKvInitSaveErr   = "failed to save initial block: %+v"
 	bsKvLoadErr       = "failed to get BlockStore from storage: %+v"
 	bsKvUnmarshalErr  = "failed to unmarshal BlockStore loaded from storage: %+v"
 	bJsonMarshalErr   = "failed to JSON marshal block %d: %+v"
@@ -218,6 +219,12 @@ func (bs *BlockStore) save() error {
 		return errors.Errorf(bsKvSaveErr, err)
 	}
 
+	// Save initial block
+	err = bs.saveBlock()
+	if err != nil {
+		return errors.Errorf(bsKvInitSaveErr, err)
+	}
+
 	return nil
 }