Merge "Add explicit sizing logic for single words" into tm-dev