LPS-48765 fix SF error (forward port)

See commit f461cde