Merge branch 'fix/add-upload.ex' into 'develop'