Merge "Fix typo." into tm-dev