HH-36521 [WIP] more general timeouts