Bug 998175 - Properly handle concurrent file transfers
Merge pull request #21730 from svic/Bug_998175_v2

Bug 998175 - Properly handle concurrent file transfers