Merge "Revert^2 "Expand ToA language support"" into main