Merge "[Bugfix] Fix the failed test case" into main