Special char conversion (cherry picked from commit 53993fe)