Fixed merge of MultipartGenerator.addPart