Merge "Fix bug #5674155 Segmentation issue for Thai"