Merge "Fix NSH_SFC linting"