Merge "Add segments client"