Merge "Multi-language support interface" into new_text