increase timeout
Merge branch 'changes'