Resolve DEICH-5385

Closed Oyvind requested to merge DEICH-5385 into master

Closes DEICH-5385

Merge request reports