Merge "Implement addAuthToken"