8.0 preprod

Merged Santiago Said requested to merge 8.0-preprod into 8.0-stage

Merge request reports