Bug 998175 - Properly handle concurrent file transfers

:+1: