Fixed issue #1445 providing the new TIMEOUT in most of the commands