re #5716 Refactor duplicate file download code as per feedback
re #5716 Refactor duplicate file download code as per feedback

david-martin/fh-fhc,grdryn/fh-fhc,wei-lee/fh-fhc,shannonmpoole/fh-fhc,nialldonnellyfh/fh-fhc,paolobueno/fh-fhc