Merge "Fix bug with mixed language text" into devel/master