Merge pull request #6755 from remitamine/external_downloader_options