LPS-40679 Fix SF