Make several changes to eliminate potential deadlock or recursive lock conditions, and add back rescan of multicast groups on network startup.