back to async and infinite timeout set
Merge branch 'bugfixes'