Resolve DEICH-5733

Merged Oyvind requested to merge DEICH-5733 into master

Merge request reports