Merge "Fix robo test case failed" into main