timeout control for tests
Merge branch 'devel'