Merge "Refactor network client"