Resolves DEICH-5500 and DEICH-5508

Closed Oyvind requested to merge DEICH-5500 into master

Closes DEICH-5500 and DEICH-5508

Merge request reports