updates
Merge https://github.com/who7734/15440
Merge https://github.com/who7734/15440
made timeout constant