3df972f18a
Close #6314 ## Summary Continuing from #7592. Created a new PR to rebase the old branch with `main`, cleaned up test errors, and improved readability. ## Test Plan Same test cases as in #7592. --------- Co-authored-by: Zanie Blue <contact@zanie.dev>