Fixing logging

theo lem requested to merge fix-logging-dev into develop

Porting changes from 30a21d0b into develop.

Merge request reports