fix tryCatch
fix timeout tests
Merge unstable into browser