8.0 modifications

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

Merge request reports