added 30s timerout
Merge branch 'master' into Major-Update