LPS-43543 Fix SF