Merge "Minor spelling fix" into tm-dev