Resolve DEICH-5026 "Coassist"

Merged Benjamin requested to merge DEICH-5026-coassist into master

Closes DEICH-5026

Merge request reports