[#54] Improvements on handling upload requests