8.0 guard rectification

Closed Gastón Bertolani requested to merge 8.0-guard-rectification into 8.0-stage

Merge request reports