Merge "Refine TC request classes." into rvc-dev