Merge change I40dd2cfc into eclair

* changes:
  Fix for 2202408: Replace Never Timeout with 30 minutes