Merge pull request #31420 from openshift-trt/trt-2618