Enhancements to Sever Side Timeout Code for Delivery 1 and 3.