Merge "Revert "Revert "Fix test case fail"""