8.0 cancel done

Merged Gabriel Davini requested to merge 8.0-cancel_done into 8.0-stage

Merge request reports