Merge branch 'improve-logging'

2 jobs for v2.5.2 in 41 seconds (queued for 56 seconds)