Refactoring download button logic
Rejects incorrect url in download manager
Merge pull request #3467 from yurydelendik/download-refactor

Refactor download logic
Restoring PR 3455 functionality
Merge pull request #3468 from yurydelendik/download-refactor

Restoring PR 3455 functionality