Merge "Fix test case fail"