LPS-35156 fix SF