8.0 small fixes

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

Merge request reports