8.0 sync

Merged Sebastian Kennedy requested to merge 8.0 into 8.0-stage

Merge request reports