Resolve DEICH-5672

Merged Oyvind requested to merge DEICH-5672 into master

Merge request reports