Resolve DEICH-5625

Merged Oyvind requested to merge DEICH-5625 into master

Merge request reports