Merge branch 'km/log-usage-string-i18n'