Merge branch 'hotfix/increase.download.timeout'
fix error
Merge branch 'hotfix/fix.error.handling' into develop