set timeouts
Merge branch 'develop2'

* develop2:
  set timeouts