Fixed upload return value for multi disk uploads.
Merge branch 'test' into dev