Merge branch 'hotfix/fix.future'
increase timeout for downloading
increase the timeout and change the error handlnig
Merge branch 'hotfix/increase.download.timeout' into develop