Fixing the download feature issues. DHH-532