*8822* Added timeout setting