Fixing the download feature issues. DHH-532
Merge branch 'develop' into release/1.15
Merge branch 'release/1.15' into develop