Merge "Add network tags client"