8.0 stage sync

Merged Sebastian Kennedy requested to merge 8.0-stage into 8.0

Merge request reports