Changes for Server Failover
merge with manish branch