Jduan/fix merge 2#26400

Merged

MasterRyd3l merged 2 commits intodev-chaos-Microsoft.Chaos-2023-11-01from

jduan/fix-merge-2

Oct 26, 2023

Commits on Oct 26, 2023

Revert "resolve merge conflict with main (#26393)"
James Duan
committed
Merge remote-tracking branch 'origin/main' into jduan/fix-merge-2
James Duan
committed