LPS-40585 Fix SF