backport fix attempt for issue #3583 by increasing timeouts