Added other upload queue for small files
Merge remote-tracking branch 'upstream/dev' into jackgu1988-work-dev