Patch proposal for 359104: enhance file upload to support i18n