Merge "fix minor whitespace nit" into tm-dev