Merge "allow extra domain input for token authentication"