Add timeout to a few missed calls
Merge branch 'iguess_develop' into iguess