LPS-51874 Fix SF issues