Merge branch 'mk/blame-error-message'