more uncontroversial changes

Merge request reports

Loading