Merge branch 'bc/commit-invalid-utf8'