Cherry pick #50537 and #50779 to release-4.8#50907
Merged
andrewbranch merged 3 commits intomicrosoft:release-4.8from Sep 22, 2022
Merged
Cherry pick #50537 and #50779 to release-4.8#50907andrewbranch merged 3 commits intomicrosoft:release-4.8from
andrewbranch merged 3 commits intomicrosoft:release-4.8from