MDS-248: Improved error handling for simple upload
Version up to 0.70