Resolve DEICH-6243

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

Closes DEICH-6243

Merge request reports