Restore overwritten content see Issue #308

Merged Christina Maria Mayr requested to merge test123 into master

I restored the overwritten content described in Issue #308 (closed) and resolved the merge conflict again. Please refer to Issue #308 (closed)

Merge request reports