issue4291 - upload file refactored