Resolve DEICH-5749

Merged Petter Goksøyr Åsen requested to merge DEICH-5749 into master

Closes DEICH-5749

Merge request reports