Cherry pick 2e08a44d

Closed David Schäfer requested to merge cherry-pick-2e08a44d into master

Merge request reports