Merge branch 'dev' into 'test'

honor settings for logging or not logging

See merge request !57
2 jobs for test in 3 minutes and 25 seconds (queued for 1 second)