8.0 stage synch

Merged Sebastian Kennedy requested to merge 8.0-stage_synch into 8.0-stage

Merge request reports