Add proxy timeouts for folders
Merge branch 'folders'

* folders:
  Add proxy timeouts for folders