Merge staging: revise file upload fix script.