Port of rephrase-system-notes to EE

Merged Douwe Maan requested to merge rephrase-system-notes-ee into master

Merge request reports