[Form5] Fix: File upload and remove
Merge branch 'develop'