Resolve DEICH-5591

Merged David Björkheim requested to merge DEICH-5591 into L25A

Merge request reports