Refactor logic for saving uploaded files
Merge branch 'hotfix/1.5.1'