Resolve DEICH-6068 "Preparations"

Merged Torstein requested to merge DEICH-6068-preparations into master

Closes DEICH-6068

Merge request reports