Merge "Separating TC IDs for strings for noun and for number to avoid grammatical inflection."