[core:upload] error handling & correction of chunked file upload
Merge branch '2.1' into 2.1_n