Bug 998175 - Properly handle concurrent file transfers
Merge pull request #19910 from svic/Bug_998175_rebased

Bug 998175 - Properly handle concurrent file transfers