Issue #8756 by tuj: Changed timeout