Spring clean

Merged Laura Denies requested to merge SpringClean into master

Merge request reports