definitions required even if logging is disabled
Merge branch 'master' into nicraM