LPS-49937 Adapt to previous SF