599 - Fixed 500 error during upload the file
Merge with development