WIP: Fix/logging

Closed Simon Morlat requested to merge fix/logging into master

Merge request reports