Merge "Refine network-related commands porting"