8.0 guard rectification

Merged Gastón Bertolani requested to merge 8.0-guard-rectification into 8.0-desynchronize-state

Merge request reports