Merge "Fix testcase_3"