Resolve DEICH-5518 "Cypress upgrade and cleanup"

Merged Magnus Westergaard requested to merge DEICH-5518-cypress-upgrade-and-cleanup into master

Closes DEICH-5518

Merge request reports