Final version for file upload, Refs #3324