LPS-38723 Fix SF