8a0f7f0975
Fix #33869, some code block is moved to make it easier to test. Added a new test
Fix #33869, some code block is moved to make it easier to test. Added a new test