case 1759 - Fallback to native timeout.
Merge remote-tracking branch 'origin/case-1759' into development