DDF-368 - added flags to enable a timeout.