Merge "Fix typo for Computer profile" into tm-dev