Merge "Improved the network type to string" into tm-dev