Merge branch 'guard-slow-logging' into 'ibm-trunk'

Guard slow logging

See merge request !66