Migrate remaining Uploaders
code into Storage
system
#6834
Merged
Uploaders
code into Storage
system
#6834