HH-36521 more general timeouts