Merge "Fix: unmappable character for encoding ASCII"