Synched with master and added 3 minutes timeout instead of the default 1 minute.