Merge pull request #5951 from WoltLab/upload-form-field-v2