Merge pull request #25862 from surajshetty3416/parallel-distributed-testing-version-13-hotfix