Merge branch 'safelogging2'