OTWO:3206 Fix invalid utf-8 encoding issues