Patch 1

Merged Laureano Kloss requested to merge patch-1 into 8.0-preprod

Merge request reports