Merge "TIS: Standardize TIS Client Token Extensions API" into main