8.0 some fixes

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

Merge request reports