Merge "TIS: Standardize TIS OAD Extensions API" into main