Merge "Move success response checking to the token client"