merge more timeout fixes from master