Merge pull request #31462 from hongkailiu/TRT-2869