Merge "Fix bug for none fe test case"