Merge "Add token to the resolver APIs"