LPS-41410 Fix SF