Merge "Fix test case failed" into main