Resolve DEICH-5647

Merged Oyvind requested to merge DEICH-5647 into master

Merge request reports