Merge "Bug fix in SFC test case"