Further work on edited text

Merged Michelle Weidling requested to merge edited-text into develop

Merge request reports