Fixing merge from 61b7a9babab736fc05fc11fb2d2b57e58be982c9
[Issue #2156] Fixing issue caused by passing nil as destination in download task method