Merge pull request #21069 from nullaus/bug1022804

bug 1022804 - Clear all references of a successful download from the Dow...
(cherry picked from commit ddfea87310513b5499200175c752ad14cf044bf7)
Merge pull request #21117 from nullaus/v2.0

Merge pull request #21069 from nullaus/bug1022804