Minimal modifications

Merged Sebastian Kennedy requested to merge 8.0-issue-7 into 8.0-stage

Merge request reports