Backport all the changes in the multipart package