Merge "Ensure getUserName cannot return null" into tm-dev