Resolves DEICH-5502 and DEICH-5504, commit: f30e5c92

Closed Oyvind requested to merge DEICH-5502 into master

Merge request reports