LPS-40606 - Fix SF