Resolve DEICH-5867

Closed Oyvind requested to merge DEICH-5867 into L27

Merge request reports