<hot-fix> fix crash for downloading
<hot-fix> Merge branch 'unstable' into hot-fix
<unstable> Merge branch 'hot-fix' into unstable