Resolve DIG-2100

Sommer, Hilde Cathrinerequested to merge
DIG-2100 into master

Closes DIG-2100

Merge request reports