[MOD] minor changes

Merged Sebastian Kennedy requested to merge 8.0-minor_changes into 8.0-preprod

Merge request reports