Merge branch 'improve_logging' into 'ibm-trunk'

Improve logging

See merge request !28