Merge "Separate token client from identity client"