Merge branch '3783_mcview_invalid_utf8'