LPS-36656 Preemptive SF to modernize some old code