8.0 desynchronize state

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

Merge request reports