[PD] thread_sf - possible patch changes needed