SFW changes for fast failover

The following changes are introduced in SFW to support fast failover: