8.0 supervisor

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

Merge request reports