CFY-19 change logic for server terminated timeout