Support timeouts in on-gestalt