LPS-34076 Fix SF