Merge "Bring in SFC support"