Merge branch 'sb/blame-msg-i18n'