4256

Merged Andreas Bayha requested to merge 4256 into master

Merge af3#4271 first!

Issue-URL: af3#4256

Merge request reports