Most of them were already ported, added a check before returning next delay if
a timeout for a (p)delay request has to be taken into account