*8787* Added timeout setting