"Upload data" -> "Upload files"
Also cleaned up a bit
Merge remote-tracking branch 'origin/dev' into dev