Set a read timeout
Merge branch 'master' into search-1.3.x