Merge "[QTIP] extend the timeout"