Fix: (reported by jylenhofgfi and xingxing) increase cli timeouts, FIX #1086