Merge "Get network type from options." into main