Update to v3.8.0

Also, some refactoring/reformatting - see commit message.

Merge request reports

Loading